From 2e6b1158ee9d1fb568bd4458162a04851b09363f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sun, 9 Jul 2017 16:42:19 +0200 Subject: [PATCH] widget: Fix priv dereference in size_allocate_with_baseline Accessing ->priv is only safe *after* the GTK_IS_WIDGET precondition, so use the get_instance_private function instead. --- gtk/gtkwidget.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 867e2a662d..ed0a34cb4a 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -5381,7 +5381,7 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget, GtkAllocation *allocation, gint baseline) { - GtkWidgetPrivate *priv; + GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); GdkRectangle real_allocation; GdkRectangle old_allocation, old_clip; GdkRectangle adjusted_allocation; @@ -5395,8 +5395,6 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget, GtkCssStyle *style; GtkBorder margin, border, padding; - priv = widget->priv; - g_return_if_fail (GTK_IS_WIDGET (widget)); if (!priv->visible && !_gtk_widget_is_toplevel (widget)) -- 2.30.2